Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[21165] Correctly initialize MatchingFailureMask constants to be used with the std::bitset API (backport #4922) #4928

Merged
merged 2 commits into from
Jun 18, 2024
Merged

[21165] Correctly initialize MatchingFailureMask constants to be used with the std::bitset API (backport #4922) #4928

merged 2 commits into from
Jun 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 10, 2024

Description

This PR changes the values of the MatchingFailureMask so they can be directly used through the std::bitset API. Before this PR, the following code:

EDP::MatchingFailureMask mask;
mask.set(EDP::MatchingFailureMask::different_typeinfo);

resulted in a C++ exception as follows:

"bitset::set: __position (which is 16) >= _Nb (which is 16)"

@Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

  • N/A: Any new/modified methods have been properly documented using Doxygen.

  • N/A: Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • Changes are API compatible.

  • N/A: New feature has been added to the versions.md file (if applicable).

  • N/A: New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.
This is an automatic backport of pull request #4922 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jun 10, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Jun 10, 2024

Cherry-pick of 5e1f1dd has failed:

On branch mergify/bp/2.6.x/pr-4922
Your branch is up to date with 'origin/2.6.x'.

You are currently cherry-picking commit 5e1f1dd22.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   include/fastdds/rtps/builtin/discovery/endpoint/EDP.h
	both modified:   test/unittest/rtps/discovery/EdpTests.cpp

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Jun 10, 2024
Merged
11 tasks
@JesusPoderoso JesusPoderoso added this to the v2.6.9 milestone Jun 10, 2024
@Mario-DL Mario-DL added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Jun 11, 2024
@Mario-DL Mario-DL self-requested a review June 11, 2024 06:32
EduPonz and others added 2 commits June 17, 2024 12:36
@EduPonz
Correctly initialize MatchingFailureMask constants to be used with …
525c36d 
…the `std::bitset` API (#4922)

* Refs #21165: Add regression test

Signed-off-by: eduponz <[email protected]>

* Refs #21165: Init MatchingFailureMask constants as normal uints

Signed-off-by: eduponz <[email protected]>

* Refs #21165: Apply Ricardo's suggestions

Signed-off-by: eduponz <[email protected]>

---------

Signed-off-by: eduponz <[email protected]>
(cherry picked from commit 5e1f1dd)

# Conflicts:
#	include/fastdds/rtps/builtin/discovery/endpoint/EDP.h
#	test/unittest/rtps/discovery/EdpTests.cpp
@Mario-DL @EduPonz
Solve conflicts
1ce0e3b 
Signed-off-by: Mario Dominguez <[email protected]>
@EduPonz EduPonz requested review from Mario-DL and removed request for Mario-DL June 17, 2024 10:37
Mario-DL
Mario-DL approved these changes Jun 17, 2024
View reviewed changes
Copy link
Member

@Mario-DL Mario-DL left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Mario-DL
Copy link
Member

Failed tests unrelated with the changes

@Mario-DL Mario-DL added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Jun 17, 2024
@EduPonz EduPonz merged commit 63561b8 into 2.6.x Jun 18, 2024
9 of 12 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4922 branch June 18, 2024 06:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mario-DL Mario-DL Mario-DL approved these changes

Assignees
No one assigned
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Milestone
v2.6.9
Development

Successfully merging this pull request may close these issues.
3 participants
@Mario-DL @EduPonz @JesusPoderoso